Organized code and small fixes
Merge branch 'master' of https://github.com/Zpiritual/fluxx