Minor tweaks, will get more attention next update