Fixed up definitions (cleaner)
Added tentative todos