Added more Meta-data + Fixed a few bugs + Improved Performance
(All in one ^^)