fixed some bugs, update views