fixed missing callback function
partial cleanup
small additions to ui for testing