minor updates and cleanup