more tweaks and "improvements"