final draft

fixed bugs fully functional