fixing a few issues, updating deps
minor tweaks