Bug fixes for status changes
Merge branch 'developer' of https://github.com/djkirby/wpi-suite-tng into developer