Fixed the Boolean Wrapper and state saving logic.

Signed-off-by: Chris Hasson <hassoncs@gmail.com>