use s for stateAt block number param to prevent conflict with bData and such, some style fixes