fix stuff zach messed up