squashed several stupid bugs