alignment to the last change and bugfixing