Renamed a method in the Option class and did some other shit