more work...

* search function raw status
* more cleanup and style