Fixes issue 67, issue 66, issue 64, issue 63, issue 62