complete views, fix bugs