fixed some bugs and renamed last section