* lots of fixes and thingys