More fixes and addtitions.