Rename some stuff to not have el-get
Add fixmes to eveything