Redirect fixes, table 2 implemented