updated libraries, use json syntax helper
updated libraries, cleanup