some more tweaks
fixed bug