minor alterations

Available at your full disposal.
Extra fixes

Some of these might not meet your approval, merge as you see fit.
Revert "Extra fixes"

This reverts commit 9ca8dfbbe45cd478165e1c686806257c93099d55.
Revert "minor alterations"

This reverts commit 70773da41dcf561eb71ae9871babd439ba068673.