small additions, examples still broken