Updated version, as well as other small fixes