some bugfixes
v1.8.3