Small modifications and TODO items