20140428-0001. some minor mods