pretty names, bug fixes