minor tweaks for everything that does work so far