A few improvements, additions, and fixes