adding and fixing shit