Large update with stabily and bugs improved