Modified ForceStateMessage
Minor refactoring, added TODOs for state forcing and correction.