cleanup
starting to work on fixing an unwrapping issue
Fixed #226