Sync'd with Class Diagram Method Names +

Also fixed up the options and displayMenu, they were messed up,
they make sense now