First Testable version
Fixes some minor issues