Fix a few problems, cause a few more...  but slowly becoming production-stable and awesome...