probably messy 

has some fixes i missed on a fresh ff profile