misc updates & minor bug fixes