Several improvements made