Fixes #83
Fixes #86
Fixes #89
Fixes #92
Fixes #84
Merge branch 'finalfix'