cleaned up some promise n00b mistakes, removed some console logs. Still a bunch of q overkill in the app but I'm too lazy to get around to it right now