made some vars look correct