You're right, for the tool to improve I'll definitely need to work on some of the rules. Consider some of these almost proof-of-concept at the moment.