fixing small details before the big rewrite