Changelog:
* Small tweaks (actually bugged).