some neat changes