Weekend Updates

Work done over the weekend.