Some nice improvements