bunch more random stuff fixed