Some additions, some fixes