fixes #7
general_fixes
raised coverage with tests