Help me upgrade my setup & improve my content!