Added some Javadocs and new functions!