Cleaning up & miscellaneous updates