[IMP] Improved Neopolitan and misc changes