fixed some mistakes
removed garbage