final changes

last clean-up changing type settings to be consistent throughout