modified normalscan.c to merge more cleanly with the devel branch (removed arguements that were used in master branch but removed in devel branch)