Bugfix

I left some bugs, yesterday, with my last push. Now fixed.