Added first external matchers and reworked some of the display logic (review mainly)

Also, fixed some limitations on actions which I had not anticipated.