Updated lib a bit. ALmost ready for release.