Finishing touches as of 1.2.14