more improvements for tonights changes