Merge pull request #644 from raistlinthewiz/develop

misc fixes