bugfixes
tidying up
new parameters for geographical constraints
not working for now