little variable changes and added some todos