Fixed dobby username compatibility, some cleanup.