JUnit tests added, some functions fixed/improved, 1 bug found.