George bugfix

Duffy, Georgerequested to merge
george_bugfix into master

All bugs fixed. Dilly dilly, bottles up.

Merge request reports