naming + snippetization
minor fixes