Ignore more files
Add missing  dependency
Handle heartbeats correctly