Added matrix and general printing