Modifying to end little bugs in running + prettyifying