minor updates
merged in changes from Lightbox