Fixing bugs and thingz