A few cleanups & TODOs