Add modelines=5 and minor changes