fixed lots of broken-ness