Some improvements (WIP)