improved matrices readability and added aggregate source support