Resaving some qlarity changes and bug fixes