Made minor changes to output style and finished a couple of minor methods