WIP: more bugs fixed :)