Small fixes and documentation/comments update