just comments
bugfix and final result