Various changes/additions