Updated Main class/Bug Fixes