Little improvements (again) :shit: