More fixes and minor touch ups