lots of useability improvements