o
k
Revert "k"

This reverts commit 993cf06913d090f012bc4eebb01cab6f004770df.
Revert "o"

This reverts commit 934f77a2274f6c10d346c1a93f84aae7f8a622ee.
various improvements