clean up code, add options for more stuff, add lightbox