Fixed updating and removed debug spam
Merge remote-tracking branch 'origin'