Some memory improvements, but still this version ran on te-srv1 with too much memory. Trying to fix it.