Debugged, made better