last typos/fixes => done