jacob fixed several small orf problems