initial checkin
minor changes
tweaks