Made a few minor changes. From now on commits should be more structured.