fixed, TODO list added.