make file
abstract and other fixes