moar small fixes (update to 7)