user test and some cleanups