More metadata, bugfixes & doc