FINISHED LOL NOT
FINISHED LOL NOT
Merge pull request #65 from chunfantasy/FINALIZING

FINALIZING
Small fixes