Some cleanup and lots of Adapter comments