some minor tweaks, still not working