model improvements, etc, (WIP)