Tweeks and optimizations to NP target