further changes, fixes