refactored, final saving on submit
events logging, recangular draw