some cleanups + added todos for next steps