Fixes

Should fix #254 (closed), #255 (closed), #256 (closed). Took this opportunity to fix up some of the wonky indents around inducedNCS stuff.

Thank you.

mentioned in commit 5b5d12b3

merged