More improvements, fleshing out