updated and cleaned up the crap that is my DLB
Merge remote-tracking branch 'origin/master'