Okay fixed these bugs (2)...