Pulled out some strings to static finals
Added logic in set normal angles to cope with the non-intersection case