Rubicon 1.1 update + FSD fixes/refactoring