House keeping.. Bug fixing. Stuff.