Comments and small bugfixes
Code cleanup in the unit tests
Committing metadata for Phpstorm