Added more ideas about functionality, organized a bit