Bug fixes, increased performance, decrease memory consumption