Methods renamed, scalar conversion added to matrix