Re added the metadata folder
Added some more tweaks
more tweeks