[z2304] Improve upon commit [z2303] and more

Thank you Evilfairy.