added volume and surface area under metadata of json file, also fixed some include errors for different systems