I marked one of the things on a TODO list that I will do. Feel free to do the other one.