adjustments to new NM's
Merge branch 'LiveServer' of https://github.com/LegionXI/darkstar into LiveServer