All sorts of fixes/changes