indent and some fixes