Fixed Kip's mistakes