Made some tweaks to stuff, using my t9n thing