Some improvements. SSA seems to be working.