Fixed some bugs and added a couple of *.jars to project