Added Clock and some improvements