* some cleanups
* allow create from modal