Small imrovements.. got add/mult/... to use scalar values