addresses #2090 #2091 #2370 #2390 closes closes #2355 #2368 #2382 #2384 Co-Authored-By: ArneBo <arne@ecobasa.org> Co-Authored-By: Flupsi <upsiflu@gmail.com> Co-Authored-By: jon r <jon@allmende.io>