table renaming
better error logging and token extending