Supply context with states on init
Fix initial align and edge calcultation with normalised alignment