better and more username matching. closes #1. probably broken though