minor tweaks - major problems remain