Bugfix
Bugfix / typo
Bugfix / error msg
typo
Merge ngi_devel
Replace pseudocode I forgot was pseudocode with realcode
fixing conflicts