Fixed bug in calculating borrelmarge
Added all product types