* A few logical fixes and changes within the code.