Fixes #70 and Fixes #71 and Fixes #72