update gitignore
Refactor keys + other things