clean up warnings
getting up to date
making adjustments to match, cat pic still doesn't switch