Added metadata.
Small fixes.