* very questionable UI progress
* model tweaks