Fixed printouts, method/member names, cleaned up code