some more stuff, tried to do bonus tasks