Fixed even more bugs. Memory issue [!]