file and code misc changes