Updated bugs..