Improved comments and some fixed typos