Finished Taras corrections (non-mobile)