Fixes
Initialize late + some cleaning up
Merge pull request #121 from wiredearp/master

Great fixes