minor tweaks and new problems