Small improvements, TODOs and commenting