General modifications, spatial averaging still bugged.