Fix #69
Fix #63
#63
Fix #72
Fix #74
Fix #71
Fix #66