More clean up and adding some extra areas