mainly akmods fixes