Improved comments & errors