Final bug fixes, ready for final challenge.