-more updates, code cleanup, popup improvement