several bugfixes
version upgrade