Initial Staging Test Fixes

Finished the initial staging test and fixed issue #4 problems