squashed a couple bugs, nothing too terrible.