various: bug-fixes: temp-mess 12