finishing off more and more stuff