Fixed bugs in state.cljs
Merge changes