Bugs fixed and questions improvements