dont redirect at the moment
some input tweaks
unneeded cast
fix for api