Major additions and bug testing.