Add Language / Style Updates / Bug Fixes