Various updates to get app in working order again