clean up comments, timeout to globals.h