Improved comments and warnings