Various additions and updates