Greatly improved readability and added some skills