Objects corrected and tested

The Modules have been tested and code has been corrected to work as
expected.