* Fixed addition of shift class, tightened label code. Neither of these should matter at all.
* Fixed initial s/d labels