Some cleanup and ease-of-use updates