Oxygen v0.06: fixed some issues;