add self
many changes
Merge branch 'master' of https://github.com/AbeDillon/RenAdventure