small edits to main class