minor changes to main class