Tidying up some loose ends. thanks @bantu