More poem

Also bug fixes