Fixed init bug, and changed some names of files
branch?
Merge pull request #1 from kasperrt/fixes

Fixes