Fixed tweaks, debugged