more fixes, some other comments tht might mean something