Further improvements, fixes #184