Fixed all the errors Derek caused