Apps changes and bug fixes