leftover changes / minor corrections