remove timeouts on reset in server
reset works better - more watertight
refactor slightly
finish reset
change div to figure