Updates and some cleanup