Merge remote-tracking branch 'anovicecodemonkey/TEDIEimprovements'