Style tweaks, and adding NX_NONCOPYABLE + others