more minor changes

Add ABC Classes,
more changes