World state framework
Minor bug fix