Comments... and todo