Clean and fixes. Still 249 MB RAM bug.