#1 Bug fixes to add, update to latest velocity

[Jeffrey Hoyt]

Tobias, we've been trying to reach you for months now. I'd really like to provide some patches back to you however we have to release this code now and your license requires us to release our changes. Sourceforge no longer allows us to take over abandoned projects, so we're planning on forking this in 2 weeks. Please, please, please get in touch with me so I don't have to do this.