some more olympian changes

working on getting it to fill correctly