Fix #68
Fix #70
Fix #75
Fix #76
Fix #77
Changes for #78