Fixed all of KEVIN'S bugs