Various tweaks & bug fixes