stability tweaks and troubleshooting