Improved comments + a todo