bugs fixed and stuff