Minor Flaws

Fixed a few minor flaws discovered after further review.