Small updates + shaunts commit