finishing some more boring stuff