Christmas Mansion: Bug fix update

This quick update fixes several bugs and improves performance.