Debugged, no bugs found, added basic cosmetics