Renaming, offhand weapons, bugfixes