state is now pickable
lint + makefile fixes

[skip ci]