Fixed bugs, there are still some nasty ones, though
Merge remote-tracking branch 'origin/master'