Protocol X: December 29 update

Bugs fixed