Clearer section delineation comments
Adds more error handling