issue 4 more tweaks
issue 4