Modifications

updates to code in main class and shell