Add Cobbler, various improvements