Add lightbox
sucessfully merged, and fixed various bugs that creeped up all over a sudden from previous version, I think it's all working fine now..