Everything's working, little tweaks