some further changes

dirty commit, probably affects #2