added p2 touchpoint instructions; cleanup for new build structure