add redirect functions where necessary, minor form changes