Commands now better! But still break.