Encountered a weird error -- committing some minor changes before screwing with anything too drastically