Get rid of those pesky invalid credenties
Fix this stuff so it works
get params better

also minor changes