Routine update

I won't really document the changes any more, I am more focused on SS
and SIF
Bug Fixes