Addresses issues #46, #163 and #156

Also corrects some typos in file name and comment