fixed some adapter stuff