reset button
update to the title and some other minor changes
merge fix