General cleaning, changed r to bohr, added clock