Added loading wheel

Loading wheel plus a few names changes and bug fixes. Some real world
testing too!