Adds some minor improvements