FIX many little bugs