phonesaw added, punsaw and VJ fixes