big fixes and changes to matchables
Merge branch 'master' of github-astralinae:astralinae/sage