Further improvements

Thanks to @HowardCohl