updates

misc updates, integrating UI
more updates

more misc updates