Some correction
Working on XML reading and adding some Javadocs.