A few fixes
Expect more activity in the next days.. I'm motivated again :)