Okay fixed these bugs...