more bug fixes, updating view variables