More small changes

Trying to get this thing to run. failing miserably.