some cleanup & updates