More improvements / bugfixes