a few small tweeks and added a new timer class