Proper config support, fix bug, start on TE compat.