custom adpater finished
minor stuff
merged and cleaned conflicts