Style and todo updates