New update!
	But still having problems with glassfish.