added p06 + some fixes