small fixes
merge with old changes
update to reflect current app standards