updated some basic stuffs