More bugs fixed and stuff