Merge pull request #627 from raistlinthewiz/develop

misc fixes