A lot of work on various things, including fixing of metadat items and some rendering