bunch of stuff fixed