clean up whitespaces
clean up spaces
make SP produce system state even when it is alone