Fixed "to do list" #1, #2, #3, #4, #13