misc updates & fixes and other