time stamps and other tweaks