* preparations for matrix forms implementation
* some package factorisation
* small code factorisations