Merge pull request #61 from seavor/jay

fix redirect
start implementing errorMsg functionality + small fixes