Fixes
Test working and cleaning up
V2.0