start styling on conversion and fixed conversions
Merge branch 'conversion' into testing