cleaned up, think i got it all