Added appointments and some fixes