Finished playing with metadata
Added comments