Finishing touches, added extra outputs