Comment by @44299 • Hey

Other fixes and improvements