incorporating Heiko changes

Minor changes from Heiko's list