Added matrix print stuff
Fixed merge conflicts