Luther Tychonievich many small updates and bug fixes