Fixed All Bugs in issue 1

SHIT FIXED YO