Update-7/23

Implemented/added changes from the TODO list.