Database stuff, Clock comments, bug fixes