Fixes in basic computations
Conflicts resolved
Removing unnecesary code