committing confirm
tweaks and updates