Fixed all stupid changes