many small hacks
now with accuracy