Finished prune_tokens + other fixes & updates