Changed profile format + some fixes