fixed some bugs
Merge pull request #1 from Academic-KevinRobayna/development

all done