Fix start token thing and stuff