several updates; //->/* + makefile