probably fixed all the bugs for now