fix bug, update things