Merge pull request #630 from raistlinthewiz/develop

misc fixes