Improved the typing finder thing