Many fixes, and a few more to come