made timer non-persistent
updated TODOs
Merge branch 'working' of github.com:jcstaff/ejava-javaee