Fixing reload bug
Source formatting
Build