Fixed svt code
Fixed ALM code
Merge branch 'omega_fix'