Review

Reviewed and researched fixes.