several bugfixes
version inc