2014.06.30: more scraps and some code changes