Bunch of changes/corrections.