fixed .gitignore, readability and calculations