Some code cleanup and option fixes, also fixing Language on NPs