Various little tweaks, no change in funcitonality