Fixed bug 69, cleanup and comment changes