Gotta catch 'em all

Made updates to get rid of some errors