Added more info to state space
Small changes