Added time stamps and a few other little things