hacked some more on timer... dont get bud. also added todos on incorrect tests