Miscellaneous changes

Lamguage? :) (also in 2013)