A few touchups here and there to fix some aesthetic issues