Tweaked a few things, nothing important