Fixme

Some random bugs and stuff