small changes, fixed update