updated several stuffs