updates to loading and redirects for dev purposes