Almost all bugs cleaned.  The problem now seems to be what to do at the corners