Finished off additional tasks for Iteration E3