#85 found more errors by clearing compiled files, fixed them