Small additions, all minor problems removed