remify
add missing states
adjust white lines