Minor tweaks, updated toolbox