YML generator + some fixes