Fix bugs and add enn + spocnn and rpocnn