lots of bug fixes, timer works, using deep extending to avoid issues default overrides