MEDIUM / Fixed some minor issues