little fixes and adjustments