jeffreyevans fixed bugs