tweaked features a bit