Added finished page and minor client comments/cleanup