Fixed 67-71
Fixed bugs 67-71