add fixes by marcell