removed obsolete presence and fixed small bugs