Cleanup + add defaults

@springmeyer can you review? Should be ready to go.