Fixed bugs with JSON and updated to new lockedAttributes standard

fixes #2