Minor progress and todo