Bug fixes + it should eat up less memory