removed weird % in places not needed