width corrected, a todo added