todo notes and fix layout of patch