Various additions and changes