quick updates and cleanup