Cleaned stuff and added some todos