use ebase instead of CAC_BASE, some cosmetic fixes