some cleanup and updates