a bit more work

nothing major, really