added a bunch of missing files + hacking around :)