Various tweaks part. 2