Adding more sections and little improvements