Updated Programming Guide

Also corrected User's Guide.