version
various improvements