bump revision to 1.6.2
refactor composer - part 1
refactor composer - part 2
small fixes