sorry, those took a while to fix