Small changes to list warp points, added ToDos