Bunch of small improvements & bug fixes.