bug fixes
oops extra init
Merge pull request #34 from ubyssey/various-fixes

bug fixes