Various minor changes to lighter