More small adjustments... someday I'll get it right