Bugfix;
Some comments added/revised, some code reformetted/refactored;