updated makectags to be actually handy