BUGFIXES working normally again