List available sections + Comments
Improvements and code fixing