Place adding and some fixes