fixes for SSAM and spacing