fixed some minor, very embarrassing bugs