adds more comments, some marker dropping fixes