fixed a few errors and added more feedback to ee
fixed merge conflict