JSON and Options improved

-JSON classes improved
-Code improved
-Options classes improved