Made the necessary conditionals to fill in data that might not exist. Cleaned up unneeded code.