Fixed bugs. Did some work on the Clerk