A feature and a small bug fix