add timestamp, fix a couple things