Add some meta and little fixes