Touchups -- Ready for final handin