more tweaks and beautification