removed 2nd clock; fixed bugs; a little clean up