fix some bugs, update few things