Various additions and minor changes