Fix touch effects and make small adjustments