Code Fixes

made some classes public to resolve access issues