Minor adjustments

More movement to NOVA. Added more syntax for id