Tweaks, find out why order isn't working.... le sigh, need to fix the heroku email issue (see email)