Lots of small debugs, prompt improvements.