fixes by

bigchimp changes