test, bug fixes & more functionality