Added section messages. Cleaned up code.