[UPDATE] (general) Clean up and fixes