Updates

Updated clock and options