minor tweaks STILL NOT READY