Minor neatness things, added  more flexible clock config stuff