Made modifications to prototype as indicated by client. Made other improvements to bring prototype closer to final version.