Added isEmpty() function
Correct typo in fromJson()
Ooooh, whole bunch of stuff to get things (almost) working