Quick Changes, more on ABXES

Some quick changes, almost done with abxes