Full makaba update, fixed all warnings