bugs and questions added