new problems and minor tweaks