Fixed some screwups