Small modifs
List of Todo's updated! Good luck