fix bugs, stupid me