some nice improvements