squashed some issues