Added Enemy logic and fixed bugs