(re-)added some lost stuff after importing code