F/operation improvements

Looootsssss of improvements.