random quick fixes; more complete update to follow when time allows