corrected various views, some parameters still commented out