some notes and cleanup