Added GetDrawClock, minor fixes