preparing for v2.1.0 and fixing some more bugs