Some more additions, changes