Various changes

Increased accuracy