Finish Edit and Add dialogues
Fix javadoc