some leftover changes

partially overwritten by last commit