Add normalizing functionality to models; update makefile