fixed bugs with last commit (sorry!)
updated json