updated composer
switched from protected to private
some tests
some coments and do an actual "cleanUp"