fixed things, tweaked stuff (??)