Todo and some minor modifications