Added settings & refactored comments; refer to CHANGELOG