Version 1.10.1, Added some json input checks and cleaned up some code