Coped with matrices

as well with initialization order fiasco