Added smart keys and cleanup
code cleanup
ignore more local files
code cleanup