Finishing off some to-dos