Just some extra stuff in the main function to make switching between looking at different things easier
Minor changes