fixed ch11 and done ch12