Added conclusion and some fixes