Milestone 1 BETA v2.1:  Fixes from the TShock thread