fixed most of first section