Done

some changes and stuff