Bugfixes and tweaks
Updated list