fixed lots of fun things