This patch aims to fix a problem that may be used to gain unfair advantage. There's also some random stuff added. Here are the following...