updated views and other things