refactors and notes