Fixed a few questions