Revert "further updates"

This reverts commit fa01dd78aeb48cec96ded2f3d07345b10a4952db.
Revert "Revert "further updates""

This reverts commit d79652998665b3ec3f053f8a55a79461cbfc4bd3.
updating
update
Merge branch 'refs/heads/UVA' into phlandscape-calculator