smooth tangents and some other fixes