Major fixes

Some srs bugs found, a lot fixed but commented one that I need to find a
way to fix