Along Came a Dragonfly: Update

Bug fixes and Improvments.