Cleaned, many clockand drawing bugs