Many updates/simplifications