Added doall's within functions to remove lazines

for testing, at least.
Notes on speed tests. have to redo with doall's