use includes in adm
lots of fixes in adm