added a todo
fixed shit that git added during failed merge (don't think max patches work so well in merging...)