- some slight adjustements, added minor notes