fixed some code and tried to update answers