Improved comments and examples