Various improvements and more code; post-crash.