Debugged, make a couple tweaks