Fixing butteryness and memory issues