more conversions
more tweaks