more lighttrap fixes