fixing a few goofups & doing stuff that doesn't quite work