some more updates, minor tweaks, WIP