End statement+metadata

Changed end statement for string arguments and metadata shit