fixes to ch12