two more bugs to work out