Matrix refactored, debugmessages removed