PATCH v.1.3.6.4.2

This includes a hotfix and a bunch of improvements.