more tweaks, some tables orange gotta fix