slight dependency cleanup and other tweaks