Several improvements and adjustments