misc update with various fixes