Further improvements, almost done