more wavers
waiver done stuff
ugh
done waivers
layout fixes