Merge more stuff, reset button, code cleanup etc.