V0.06

Minor tweaks