Improved comments and added some missing ones