improve procedures, bug fixes, new view