Various fixes and additions to christmas project