...
Hopefully fixed annoying bugs