small fixes and removing a section