Various changes and additions