Add modeline
Improve upstream support for omni
Clean and add comments