Updated GUI and some javadocs