fixed minor bugs + cleaned up some NSLogs