comments on all the code + logo change + minor refactoring