removed "scratch" folder from master because it belongs in the devel branch
fixed some compiler errors under linux