small changes, improved useability