fix indentation, stub out more stuff