small changes, see commit titles