fixed small errors, merged my old stuff