started adding macros, modifined timer functions on EJApp