Refactor blank, null and verbose names, review related fields
Fix .gitignore
Some small fixes