Updated stuff based on TODO list.