- Several improvements