Some cleanup and precision support, better defaults