Still have lots to do. Some of these marked with TODO indicating needing further work (but better than it was before).