some fixing in client's states
debug action now works better