I'm happy now

Minor tweaks, yuesh!