more stabilisation, bugfixing and cleanup. good update