Comments & refactorizations & fixes