Commit 1.19

Fixes and annotations for various different functions. Changes to names.
Continuing work on UI.