added comments (not working) and popup
merge