Made better comments and solved error handling in 1.1