made some tests green; htmlgen still broken