Various updates

Added N13, N2.1 and N22 symbols, improved versions of E36, N40, N41, S4
and S5