Fixes #13 and #15 plus continuation of verification, testing remaining