bugfixes
Merge pull request #34 from marqh/initfixups

bugfixes