MADE:
--> Added function call to Matrix
--> Fixed some functions